repo: Simplify sign_data() a little
authorMatthew Barnes <mbarnes@redhat.com>
Thu, 7 May 2015 21:50:22 +0000 (17:50 -0400)
committerMatthew Barnes <mbarnes@redhat.com>
Thu, 7 May 2015 21:50:22 +0000 (17:50 -0400)
Use ot_gpgme_data_output() to wrapper a GOutputStream.

src/libostree/ostree-repo.c

index 4d8a73351ddfac7f1e43bb393efc4d6291acbc8f..d823725d68af4f261e1bbbdf51365ea5e9cd375b 100644 (file)
@@ -3108,7 +3108,6 @@ sign_data (OstreeRepo     *self,
   gpgme_key_t key = NULL;
   gpgme_data_t commit_buffer = NULL;
   gpgme_data_t signature_buffer = NULL;
-  int signature_fd = -1;
   GMappedFile *signature_file = NULL;
   
   if (!gs_file_open_in_tmpdir (self->tmp_dir, 0644,
@@ -3179,22 +3178,9 @@ sign_data (OstreeRepo     *self,
         goto out;
       }
   }
-  
-  signature_fd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*)tmp_signature_output);
-  if (signature_fd < 0)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Unable to open signature file");
-      goto out;
-    }
-  
-  if ((err = gpgme_data_new_from_fd (&signature_buffer, signature_fd)) != GPG_ERR_NO_ERROR)
-    {
-      ot_gpgme_error_to_gio_error (err, error);
-      g_prefix_error (error, "Failed to create buffer for signature file: ");
-      goto out;
-    }
-  
+
+  signature_buffer = ot_gpgme_data_output (tmp_signature_output);
+
   if ((err = gpgme_op_sign (context, commit_buffer, signature_buffer, GPGME_SIG_MODE_DETACH))
       != GPG_ERR_NO_ERROR)
     {